Bring in NEW_STRINGS for gdb, saroute, igc, garmin, delbin, and an1.

Not because they actually work (in fact, they're all believed problematic)
but just to get them committed.

diff --git a/gpsbabel/an1.cc b/gpsbabel/an1.cc
index a12dcd1db147ab3178e94a70933901b1cdcba371..e32c05893671801281c37c0bb3ed5dc50ef0376f 100644 (file)
--- a/gpsbabel/an1.cc
+++ b/gpsbabel/an1.cc
@@ -693,8 +693,8 @@ static void Read_AN1_Waypoints(gbfile* f)
   unsigned long i = 0;
   an1_waypoint_record* rec = NULL;
   waypoint* wpt_tmp;
-  char* icon = NULL;
   char* url = NULL;
+  char* icon = NULL;
   ReadShort(f);
   count = ReadLong(f);
   for (i = 0; i < count; i++) {
@@ -711,12 +711,20 @@ static void Read_AN1_Waypoints(gbfile* f)
     wpt_tmp->description = xstrdup(rec->name);
     if (rec->url) {
       wpt_tmp->AddUrlLink(rec->url);
+#if NEW_STRINGS
+    } else {
+      int u = wpt_tmp->description.indexOf("{URL=");
+      QString us = wpt_tmp->description.mid(u);
+      wpt_tmp->AddUrlLink(us);
+    }
+#else
     } else if (NULL != (url=strstr(wpt_tmp->description, "{URL="))) {
       *url = '\0';
       url += 5;
       url[strlen(url)-1] = '\0';
       wpt_tmp->AddUrlLink(url);
     }
+#endif
 
     if (rec->image_name) {
       wpt_tmp->icon_descr = xstrdup(rec->image_name);
@@ -769,7 +777,11 @@ Write_One_AN1_Waypoint(const waypoint* wpt)
   rec->name = xstrdup(wpt->description);
 
   if (!nogc && wpt->gc_data->id) {
+#if NEW_STRINGS
+    char* extra = (char*) xmalloc(25 + wpt->gc_data->placer.length() + wpt->shortname.length());
+#else
     char* extra = (char*) xmalloc(25 + strlen(wpt->gc_data->placer.toUtf8().data()) + strlen(wpt->shortname));
+#endif
     sprintf(extra, "\r\nBy %s\r\n%s (%1.1f/%1.1f)",
             wpt->gc_data->placer.toUtf8().data(),
             CSTRc(wpt->shortname), wpt->gc_data->diff/10.0,
@@ -787,8 +799,11 @@ Write_One_AN1_Waypoint(const waypoint* wpt)
     xfree(extra);
     rec->url = xstrdup(l.url_.toUtf8().data());
   }
-
+#if NEW_STRINGS
+  if (!wpt->notes.isEmpty()) {
+#else
   if (wpt->notes) {
+#endif
     if (rec->comment) {
       xfree(rec->comment);
     }
@@ -867,9 +882,13 @@ static void Read_AN1_Lines(gbfile* f)
       wpt_tmp->latitude = DecodeOrd(vert->lat);
       wpt_tmp->longitude = -DecodeOrd(vert->lon);
       wpt_tmp->shortname = (char*) xmalloc(7);
+#if NEW_STRINGS
+      wpt_tmp->shortname = QString().sprintf("\\%5.5lx", rtserial++);
+#else
       sprintf(wpt_tmp->shortname, "\\%5.5lx", rtserial++);
       fs_chain_add(&wpt_tmp->fs,
                    (format_specific_data*)vert);
+#endif
       route_add_wpt(rte_head, wpt_tmp);
     }
   }

diff --git a/gpsbabel/delbin.cc b/gpsbabel/delbin.cc
index d68e3442c05bfda89aca005df76a3f55d8305cbb..1d3a1ac0a15e36dc6a329fc457333ced13524167 100644 (file)
--- a/gpsbabel/delbin.cc
+++ b/gpsbabel/delbin.cc
@@ -22,7 +22,9 @@
 
 #include "defs.h"
 #include "src/core/xmltag.h"
-
+#if REALLY_MINIMAL
+ff_vecs_t delbin_vecs;
+#else
 #include <assert.h>
 
 #define MYNAME "delbin"
@@ -3356,3 +3358,4 @@ waypoint_symbol_index(const char* name)
 }
 
 // vi: ts=4 sw=4 noexpandtab
+#endif

diff --git a/gpsbabel/garmin.cc b/gpsbabel/garmin.cc
index 0ec4a63985a47797faedfe6741eb4855faf48e64..5d5d384ecc5dadaeec0e43a9b3c96c8bcbfda55e 100644 (file)
--- a/gpsbabel/garmin.cc
+++ b/gpsbabel/garmin.cc
@@ -30,6 +30,11 @@
 #include "garmin_fs.h"
 #include "garmin_device_xml.h"
 
+#if REALLY_MINIMAL
+//  I just don't want to cope with this format right now.
+ff_vecs_t garmin_vecs = { };
+#else
+
 #define SOON 1
 
 #define MYNAME "GARMIN"
@@ -360,8 +365,13 @@ waypt_read(void)
 
     wpt_tmp->shortname = xstrdup(way[i]->ident);
     wpt_tmp->description = xstrdup(way[i]->cmnt);
+#if NEW_STRINGS 
+    wpt_tmp->shortname = wpt_tmp->shortname.simplified();
+    wpt_tmp->description = wpt_tmp->description.simplified();
+#else
     rtrim(wpt_tmp->shortname);
     rtrim(wpt_tmp->description);
+#endif
     wpt_tmp->longitude = way[i]->lon;
     wpt_tmp->latitude = way[i]->lat;
     if (gps_waypt_type == 103) {
@@ -904,17 +914,26 @@ waypoint_prepare(void)
   QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
     waypoint* wpt;
     char* ident;
-    char* src = NULL;
     char obuf[256];
 
     wpt = (waypoint*) elem;
-
+#if NEW_STRINGS 
+    QString src;
+    if (!wpt->description.isEmpty()) {
+      src = wpt->description;
+    }
+    if (!wpt->notes.isEmpty()) {
+      src = wpt->notes;
+    }
+#else
+    char *src = NULL;
     if (wpt->description) {
       src = wpt->description;
     }
     if (wpt->notes) {
       src = wpt->notes;
     }
+#endif
 
     /*
      * mkshort will do collision detection and namespace
@@ -1084,13 +1103,20 @@ route_waypt_pr(const waypoint* wpt)
   }
 
   rte->ident[sizeof(rte->ident)-1] = 0;
-
+#if NEW_STRINGS
+  if (wpt->description.isEmpty()) {
+    strncpy(rte->cmnt, CSTR(wpt->description), sizeof(rte->cmnt));
+    rte->cmnt[sizeof(rte->cmnt)-1] = 0;
+  } else {
+  }
+#else
   if (wpt->description) {
     strncpy(rte->cmnt, wpt->description, sizeof(rte->cmnt));
     rte->cmnt[sizeof(rte->cmnt)-1] = 0;
   } else  {
     rte->cmnt[0] = 0;
   }
+#endif
   cur_tx_routelist_entry++;
 }
 
@@ -1289,3 +1315,4 @@ d103_icon_number_from_symbol(const QString& s)
   }
   return 0;
 }
+#endif

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index 3345002dfb10e09d1307df7f6ea936e3a30621ad..a18f252703604851f673f7db706d37a9ddcde368 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -201,7 +201,11 @@ disp_summary(const gbfile* f)
 #define FREAD_i32 gbfgetint32(fin)
 #define FREAD_i16 gbfgetint16(fin)
 #define FREAD_STR(a) gdb_fread_str(a,sizeof(a),fin)
+#if NEW_STRINGS
+#define FREAD_CSTR QString::fromLatin1(gdb_fread_cstr(fin))
+#else
 #define FREAD_CSTR gdb_fread_cstr(fin)
+#endif
 #define FREAD_CSTR_AS_QSTR gdb_fread_cstr_as_qstr(fin)
 #define FREAD_DBL gbfgetdbl(fin)
 #define FREAD_LATLON GPS_Math_Semi_To_Deg(gbfgetint32(fin))
@@ -281,12 +285,14 @@ gdb_fread_str(char* buf, int size, gbfile* fin)
 static QString
 gdb_fread_strlist(void)
 {
-  char* res = NULL;
+//  char* res = NULL;
+  QString res;
   int count;
 
   count = FREAD_i32;
 
   while (count > 0) {
+#if HUH
     char* str = FREAD_CSTR;
     if (str != NULL) {
       if (*str && (res == NULL)) {
@@ -295,11 +301,17 @@ gdb_fread_strlist(void)
         xfree(str);
       }
     }
+#else
+    QString str = FREAD_CSTR;
+    if (!str.isEmpty()) {
+      res = str;
+    }
+#endif
     count--;
   }
 
   QString qres = res;
-  xfree(res);
+//  xfree(res);
   return qres;
 }
 
@@ -307,11 +319,19 @@ static waypoint*
 gdb_find_wayptq(const queue* Q, const waypoint* wpt, const char exact)
 {
   queue* elem, *tmp;
+#if NEW_STRINGS
+  QString name = wpt->shortname;
+#else
   const char* name = wpt->shortname;
+#endif
 
   QUEUE_FOR_EACH(Q, elem, tmp) {
     waypoint* tmp = (waypoint*)elem;
+#if NEW_STRINGS
+    if (name.compare(tmp->shortname,Qt::CaseInsensitive) == 0) {
+#else
     if (case_ignore_strcmp(name, tmp->shortname) == 0) {
+#endif
 
       if (! exact) {
         return tmp;
@@ -370,7 +390,11 @@ gdb_add_route_waypt(route_head* rte, waypoint* ref, const int wpt_class)
     }
   }
   res = NULL;
+#if NEW_STRINGS
+  turn_point = (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && !tmp->description.isEmpty());
+#else
   turn_point = (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && tmp->description);
+#endif
   if (turn_point || (gdb_via == 0) || (wpt_class < gt_waypt_class_map_point)) {
     res = waypt_dupe(tmp);
     route_add_wpt(rte, res);
@@ -507,7 +531,6 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
 
   gmsd = garmin_fs_alloc(-1);
   fs_chain_add(&res->fs, (format_specific_data*) gmsd);
-
   res->shortname = FREAD_CSTR;
 #if GDB_DEBUG
   sn = xstrdup(nice(res->shortname));
@@ -611,7 +634,6 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
   /* VERSION DEPENDENT CODE */
 
   if (gdb_ver <= GDB_VER_2) {
-    char* temp;
 
     FREAD(buf, 2);                             /* ?????????????????????????????????? */
     waypt_flag = FREAD_C;
@@ -621,15 +643,12 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
       FREAD(buf, 2);
     }
 
-    temp = FREAD_CSTR;                         /* undocumented & unused string */
+    QString junk = FREAD_CSTR;                         /* undocumented & unused string */
 #if GDB_DEBUG
     DBG(GDB_DBG_WPTe, temp)
     printf(MYNAME "-wpt \"%s\" (%d): Unknown string = %s\n",
            sn, wpt_class, nice(temp));
 #endif
-    if (temp) {
-      xfree(temp);
-    }
 
     QString linky = FREAD_CSTR_AS_QSTR;
     UrlLink l(linky);
@@ -649,7 +668,6 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
 
     FREAD(buf, 5);                             /* instruction depended */
     res->description = FREAD_CSTR;             /* instruction */
-
     url_ct = FREAD_i32;
     for (i = url_ct; (i); i--) {
       QString str = FREAD_CSTR_AS_QSTR;
@@ -726,8 +744,11 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
       GMSD_SETSTR(country, gt_get_icao_country(str));
     }
   }
-
+#if NEW_STRINGS
+  if (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && !res->description.isEmpty()) {
+#else
   if (gdb_roadbook && (wpt_class > gt_waypt_class_map_point) && res->description) {
+#endif
     wpt_class = gt_waypt_class_user_waypoint;
     GMSD_SET(wpt_class, wpt_class);
 #ifdef GMSD_EXPERIMENTAL
@@ -1289,18 +1310,30 @@ gdb_check_waypt(waypoint* wpt)
   }
 
   if ((wpt->latitude < -90) || (wpt->latitude > 90.0))
+#if NEW_STRINGS
+    fatal("Invalid latitude %f in waypoint %s.\n",
+          lat_orig, !wpt->shortname.isEmpty() ? CSTRc(wpt->shortname) : "<no name>");
+  if ((wpt->longitude < -180) || (wpt->longitude > 180.0))
+    fatal("Invalid longitude %f in waypoint %s.\n",
+          lon_orig, !wpt->shortname.isEmpty() ? CSTRc(wpt->shortname) : "<no name>");
+#else
     fatal("Invalid latitude %f in waypoint %s.\n",
           lat_orig, wpt->shortname ? CSTRc(wpt->shortname) : "<no name>");
   if ((wpt->longitude < -180) || (wpt->longitude > 180.0))
     fatal("Invalid longitude %f in waypoint %s.\n",
           lon_orig, wpt->shortname ? CSTRc(wpt->shortname) : "<no name>");
+#endif
 }
 
 /*-----------------------------------------------------------------------------*/
 
 static void
 write_waypoint(
+#if NEW_STRINGS
+  const waypoint* wpt, const QString& shortname, garmin_fs_t* gmsd,
+#else
   const waypoint* wpt, const char* shortname, garmin_fs_t* gmsd,
+#endif
   const int icon, const int display)
 {
   char zbuf[32], ffbuf[32];
@@ -1336,7 +1369,11 @@ write_waypoint(
   FWRITE_LATLON(wpt->latitude);                /* latitude */
   FWRITE_LATLON(wpt->longitude);               /* longitude */
   FWRITE_DBL(wpt->altitude, unknown_alt);      /* altitude */
+#if NEW_STRINGS
+  if (!wpt->notes.isEmpty()) {
+#else
   if (wpt->notes) {
+#endif
     FWRITE_CSTR(wpt->notes);
   } else {
     FWRITE_CSTR(wpt->description);
@@ -1372,7 +1409,8 @@ write_waypoint(
   } else { /* if (gdb_ver > GDB_VER_3) */
     int cnt;
 //    url_link* url_next;
-    const char* str;
+//    const char* str;
+    QString str;
 
     if (wpt_class < gt_waypt_class_map_point) {        /* street address */
       str  = GMSD_GET(addr, "");
@@ -1384,7 +1422,16 @@ write_waypoint(
 
     /* GBD doesn't have a native description field */
     /* here we misuse the instruction field */
-
+#if 1
+    QString d = wpt->description;
+    if (wpt->description == wpt->shortname) {
+      d.clear();
+    }
+    if (str == wpt->notes) {
+      d.clear();
+    }
+    FWRITE_CSTR(d);                            /* instruction */
+#else
     str = wpt->description;
     if (str && (strcmp(str, wpt->shortname) == 0)) {
       str = NULL;
@@ -1393,6 +1440,7 @@ write_waypoint(
       str = NULL;
     }
     FWRITE_CSTR(str);                          /* instruction */
+#endif
 
     cnt = 0;
     cnt += wpt->url_link_list_.size();
@@ -1450,7 +1498,7 @@ route_write_bounds(bounds* bounds)
 }
 
 static void
-write_route(const route_head* rte, const char* rte_name)
+write_route(const route_head* rte, const QString& rte_name)
 {
   bounds bounds;
   int points, index;
@@ -1565,7 +1613,7 @@ write_route(const route_head* rte, const char* rte_name)
 }
 
 static void
-write_track(const route_head* trk, const char* trk_name)
+write_track(const route_head* trk, const QString& trk_name)
 {
   queue* elem, *tmp;
   int points = ELEMENTS(trk);
@@ -1622,7 +1670,8 @@ finalize_item(gbfile* origin, const char identifier)
 }
 
 /*-----------------------------------------------------------------------------*/
-
+#if NEW_STRINGS
+#else
 static char
 str_not_equal(const char* s1, const char* s2)
 {
@@ -1641,6 +1690,7 @@ str_not_equal(const char* s1, const char* s2)
     return 0;
   }
 }
+#endif
 
 static void
 write_waypoint_cb(const waypoint* refpt)
@@ -1650,8 +1700,12 @@ write_waypoint_cb(const waypoint* refpt)
   gbfile* fsave;
 
   /* do this when backup always happens in main */
-
+#if NEW_STRINGS
+// but, but, casting away the const here is wrong...
+  ((waypoint*)refpt)->shortname = refpt->shortname.trimmed();
+#else
   rtrim(((waypoint*)refpt)->shortname);
+#endif
   test = gdb_find_wayptq(&wayptq_out, refpt, 1);
 
   if (refpt->HasUrlLink() && test && test->HasUrlLink() && route_flag == 0) {
@@ -1663,14 +1717,22 @@ write_waypoint_cb(const waypoint* refpt)
   }
 
   if ((test != NULL) && (route_flag == 0)) {
+#if NEW_STRINGS
+    if (test->notes != refpt->notes) {
+#else
     if (str_not_equal(test->notes, refpt->notes)) {
+#endif
       test = NULL;
     }
   }
 
   if (test == NULL) {
     int icon, display, wpt_class;
+#if NEW_STRINGS
+    QString name;
+#else
     char* name;
+#endif
     waypoint* wpt = waypt_dupe(refpt);
 
     gdb_check_waypt(wpt);
@@ -1718,6 +1780,16 @@ write_waypoint_cb(const waypoint* refpt)
 
     name = wpt->shortname;
 
+#if NEW_STRINGS
+    if (global_opts.synthesize_shortnames || name.isEmpty()) {
+      name = wpt->notes;
+      if (name.isEmpty()) {
+        name = wpt->description;
+      }
+      if (name.isEmpty()) {
+        name = wpt->shortname;
+      }
+#else
     if (global_opts.synthesize_shortnames || (*name == '\0')) {
       name = wpt->notes;
       if (!name) {
@@ -1726,10 +1798,16 @@ write_waypoint_cb(const waypoint* refpt)
       if (!name) {
         name = wpt->shortname;
       }
+#endif
     }
 
     name = mkshort(short_h, name);
+#if NEW_STRINGS
+#warning WTH is THIS?  Have some dead beef instead.
+    wpt->extra_data = (void*) 0xdeadbeef;
+#else
     wpt->extra_data = (void*)name;
+#endif
     write_waypoint(wpt, name, gmsd, icon, display);
 
     finalize_item(fsave, 'W');
@@ -1740,13 +1818,13 @@ static void
 write_route_cb(const route_head* rte)
 {
   gbfile* fsave;
-  char* name;
   char buf[32];
 
   if (ELEMENTS(rte) <= 0) {
     return;
   }
 
+  QString name;
   if (rte->rte_name == NULL) {
     snprintf(buf, sizeof(buf), "Route%04d", rte->rte_num);
     name = mkshort(short_h, buf);
@@ -1760,15 +1838,13 @@ write_route_cb(const route_head* rte)
   fout = ftmp;
   write_route(rte, name);
   finalize_item(fsave, 'R');
-
-  xfree(name);
 }
 
 static void
 write_track_cb(const route_head* trk)
 {
   gbfile* fsave;
-  char* name;
+  QString name;
   char buf[32];
 
   if (ELEMENTS(trk) <= 0) {
@@ -1789,7 +1865,6 @@ write_track_cb(const route_head* trk)
   write_track(trk, name);
   finalize_item(fsave, 'T');
 
-  xfree(name);
 }
 
 /*-----------------------------------------------------------------------------*/

diff --git a/gpsbabel/igc.cc b/gpsbabel/igc.cc
index f9d9c810a28e3a31474c2d00fe5cdc23fd533488..fabef80908aa7bafcd69a3f880b860c21d5ceaa0 100644 (file)
--- a/gpsbabel/igc.cc
+++ b/gpsbabel/igc.cc
@@ -27,6 +27,9 @@
 #include <math.h>
 
 #include "defs.h"
+#if REALLY_MINIMAL
+ff_vecs_t igc_vecs;
+#else
 
 static gbfile* file_in, *file_out;
 static char manufacturer[4];
@@ -927,3 +930,4 @@ ff_vecs_t igc_vecs = {
   igc_args,
   CET_CHARSET_ASCII, 0 /* CET-REVIEW */
 };
+#endif

diff --git a/gpsbabel/saroute.cc b/gpsbabel/saroute.cc
index 3d6424f41529de20b716f36b67fa9768bbd29d13..d1a4db137ad2a190da76c5402b0ed36fe4bc6ef4 100644 (file)
--- a/gpsbabel/saroute.cc
+++ b/gpsbabel/saroute.cc
@@ -225,7 +225,10 @@ my_read(void)
 
         addrlen = le_read16(&record[obase]);
         cmtlen = le_read16(&record[obase+2+addrlen]);
-
+#if NEW_STRINGS
+        wpt_tmp->shortname = "booger";
+        wpt_tmp->notes = "goober";
+#else
         wpt_tmp->shortname = (char*) xmalloc(addrlen+1);
         wpt_tmp->shortname[addrlen]='\0';
         wpt_tmp->notes = (char*) xmalloc(cmtlen+1);
@@ -236,9 +239,14 @@ my_read(void)
         memcpy(wpt_tmp->shortname,
                record+obase+2,
                addrlen);
+#endif
       } else {
+#if NEW_STRINGS
+        wpt_tmp->shortname = QString().sprintf("\\%5.5x", serial++);
+#else
         wpt_tmp->shortname = (char*) xmalloc(7);
         sprintf(wpt_tmp->shortname, "\\%5.5x", serial++);
+#endif
       }
       if (control == 2) {
         waypt_add(wpt_tmp);
@@ -316,6 +324,11 @@ my_read(void)
             route_add_head(track_head);
           }
         } // end if
+#if NEW_STRINGS
+        if (track_head->rte_name.isEmpty()) {
+          track_head->rte_name = "I made this up";
+        }
+#else
         if (!track_head->rte_name) {
           track_head->rte_name =
             (char*)xmalloc(stringlen+1);
@@ -323,6 +336,7 @@ my_read(void)
                   (const char*) record+2, stringlen);
           track_head->rte_name[stringlen] = '\0';
         }
+#endif
       }
 
       if (timesynth) {
@@ -361,15 +375,23 @@ my_read(void)
         wpt_tmp->latitude = lat;
         wpt_tmp->longitude = -lon;
         if (stringlen && ((coordcount>1) || count)) {
+#if NEW_STRINGS
+          wpt_tmp->shortname = QString(((char*)record)+2);
+#else
           wpt_tmp->shortname = (char*) xmalloc(stringlen+1);
           wpt_tmp->shortname[stringlen] = '\0';
           memcpy(wpt_tmp->shortname,
                  ((char*)record)+2,
                  stringlen);
+#endif
         } else {
+#if NEW_STRINGS
+          wpt_tmp->shortname = QString().sprintf("\\%5.5x", serial++);
+#else
           wpt_tmp->shortname = (char*) xmalloc(7);
           sprintf(wpt_tmp->shortname, "\\%5.5x",
                   serial++);
+#endif
         }
         if (timesynth) {
           if (!first) {